Revising the Select Query I solution